Auto merge of #1405 - alexcrichton:issue-1401, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 26 Mar 2015 21:42:57 +0000 (21:42 +0000)
committerbors <bors@rust-lang.org>
Thu, 26 Mar 2015 21:42:57 +0000 (21:42 +0000)
commitff62f95da6c5f5f81f1b305eb4c32f04cd49ddc3
tree2fd562e26b657d7af4ba0cb7df70aa17276c9d89
parentcb21229b1f5ea9b19a39610c7b5e2fc3e5f97a0a
parent7756fe685f74d36b6e73acb05f51019f339293fd
Auto merge of #1405 - alexcrichton:issue-1401, r=alexcrichton

This should inadvertently fix #1401